bitkeeper revision 1.1236.25.19 (423553b79iCQL1CPX5dZyBiY8j8pnQ)
authorakw27@arcadians.cl.cam.ac.uk <akw27@arcadians.cl.cam.ac.uk>
Mon, 14 Mar 2005 09:04:55 +0000 (09:04 +0000)
committerakw27@arcadians.cl.cam.ac.uk <akw27@arcadians.cl.cam.ac.uk>
Mon, 14 Mar 2005 09:04:55 +0000 (09:04 +0000)
commit5a17dded4df2ee00dafe6bf8dd44b3143c2e4ee6
tree5f5bcc1ff5172a5ccd3ccfe8d728e2cc6a84ae38
parent431e289bb6e60987362f63112322ca5ce915e10a
parenta44d3598295fdd2fc742bb7b36695f82ddb77c36
bitkeeper revision 1.1236.25.19 (423553b79iCQL1CPX5dZyBiY8j8pnQ)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xeno.bk
into arcadians.cl.cam.ac.uk:/auto/anfs/nos1/akw27/xeno-clone/xeno.bk
linux-2.6.11-xen-sparse/drivers/xen/blktap/blktap_datapath.c
linux-2.6.11-xen-sparse/drivers/xen/blktap/blktap_userdev.c